From 15ac5164cc4a1ae94deea733e59ef66a8e0fe63b Mon Sep 17 00:00:00 2001
From: oliskoli <oliskoli@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Fri, 4 Apr 2008 22:27:26 +0000
Subject: [PATCH] GPSBabelGUI: Enquote gpsbabel.exe commandline. In input
 options dialog try to filter out some options thought for the output.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@3169 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/win32/gui-2/GPSBabelGUI.dof |   4 ++--
 gpsbabel/win32/gui-2/GPSBabelGUI.res | Bin 1752 -> 1752 bytes
 gpsbabel/win32/gui-2/options.pas     |  21 +++++++++++++--------
 gpsbabel/win32/gui-2/utils.pas       |   2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/gpsbabel/win32/gui-2/GPSBabelGUI.dof b/gpsbabel/win32/gui-2/GPSBabelGUI.dof
index 8788f2726..6fe9ebaa6 100644
--- a/gpsbabel/win32/gui-2/GPSBabelGUI.dof
+++ b/gpsbabel/win32/gui-2/GPSBabelGUI.dof
@@ -56,7 +56,7 @@ IncludeVerInfo=1
 AutoIncBuild=0
 MajorVer=0
 MinorVer=2
-Release=13
+Release=14
 Build=0
 Debug=0
 PreRelease=0
@@ -68,7 +68,7 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=GPSBabel Makers
 FileDescription=GPSBabel Windows Frontend
-FileVersion=0.2.13.0
+FileVersion=0.2.14.0
 InternalName=
 LegalCopyright=(C) 2005-2008 Olaf Klein (o.b.klein@gpsbabel.org)
 LegalTrademarks=
diff --git a/gpsbabel/win32/gui-2/GPSBabelGUI.res b/gpsbabel/win32/gui-2/GPSBabelGUI.res
index 3776c1003a776aeaf5456deff25db3cf63227065..53588f23b6cabf6d115c9ef1aa834baa8db2b411 100644
GIT binary patch
delta 29
icmcb?dxLkwA!bfK1||j&;M;tfS)P&6Wb<p5w~PRFGY8E8

delta 29
icmcb?dxLkwA!bfq1||j&;N5(hS)P&6c=KzPw~PRF3kS*o

diff --git a/gpsbabel/win32/gui-2/options.pas b/gpsbabel/win32/gui-2/options.pas
index da32e6bf6..5979d16d3 100644
--- a/gpsbabel/win32/gui-2/options.pas
+++ b/gpsbabel/win32/gui-2/options.pas
@@ -159,9 +159,11 @@ var
   xy, _xy: TPoint;
   xmax: Integer;
   lb: TLabel;
+  us: string;
+
 begin
   if (AList = nil) then Exit;
-  
+
   FOpts := AList;
 
   xy.x := 0;
@@ -188,13 +190,16 @@ begin
       btnHelp.ShowHint := True;
     end;
 
-    if FIsInput and (
-       (AnsiPos('generate ', o.hint) <> 0) or
-       (AnsiPos(' generate', o.hint) <> 0) or
-       (AnsiPos('output ', o.hint) <> 0) or
-       (AnsiPos(' output', o.hint) <> 0) or
-       (AnsiPos('write', o.hint) <> 0) or
-       (AnsiPos(' write', o.hint) <> 0)) then Continue;
+    us := AnsiLowerCase(o.hint);
+    if FIsInput and (AnsiPos('read', us) = 0) and
+      (
+       (AnsiPos('generate ', us) <> 0) or
+       (AnsiPos(' generate', us) <> 0) or
+       (AnsiPos('output ', us) <> 0) or
+       (AnsiPos(' output', us) <> 0) or
+       (AnsiPos('write', us) <> 0) or
+       (AnsiPos(' write', us) <> 0)
+      ) then Continue;
 
     chb := TCheckBox.Create(nil);
     o.chb := chb;
diff --git a/gpsbabel/win32/gui-2/utils.pas b/gpsbabel/win32/gui-2/utils.pas
index 94eded716..a6a54d11c 100644
--- a/gpsbabel/win32/gui-2/utils.pas
+++ b/gpsbabel/win32/gui-2/utils.pas
@@ -116,7 +116,7 @@ begin
   if (Copy(CommandLine, 1, 1) = '~') then
     sCmd := System.Copy(CommandLine, 2, Length(CommandLine) - 1)
   else
-    sCmd := SysUtils.Format('%s %s ', [gpsbabel_exe, CommandLine]);
+    sCmd := SysUtils.Format('"%s" %s ', [gpsbabel_exe, CommandLine]);
 
   SecurityAttr.nLength := sizeof(TSECURITYATTRIBUTES);
   SecurityAttr.bInheritHandle := true;
-- 
2.30.2